<!DOCTYPE html>
<html lang="en">

<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>

<body>
    <h1>欢迎来到计算机世界</h1>
    <p>你好</p>
    <em>我叫马默涵</em>
    <p>1111</p>
<<<<<<< HEAD
    好 修改n次 好

    <div>
        你好
    </div>
    <div>
        你好
    </div>
    <div>
        你好
    </div>
    <div>
        你好
    </div>
=======
    <em>6666</em>
    <div>我来制造冲突</div>
    <div>我来制造冲突</div>
    <div>我来制造冲突</div>
    <div>我来制造冲突</div>
    <div>我来制造冲突</div>
    <p>天天制造冲突</p>
    <p>主人回来啦</p>
>>>>>>> 1936a85ba7894970c4793228dbcfe04785a82608
</body>

</html>